From 36388a1fbfe0955bab5b7884a82788a1a16c2d7f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 4 Apr 2005 04:36:04 +0000 Subject: [PATCH] Use gtk_accel_map_change_entry(), so that reusing the same action name 2005-04-04 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): Use gtk_accel_map_change_entry(), so that reusing the same action name works. (#170727, Paolo Borelli) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkactiongroup.c | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 82c25cf30d..05e369f8db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-04-04 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Use gtk_accel_map_change_entry(), so that reusing the same + action name works. (#170727, Paolo Borelli) + 2005-04-04 Tor Lillqvist * gdk/win32/gdkmain.c (_gdk_win32_cf_to_string): New debugging diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 82c25cf30d..05e369f8db 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-04-04 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Use gtk_accel_map_change_entry(), so that reusing the same + action name works. (#170727, Paolo Borelli) + 2005-04-04 Tor Lillqvist * gdk/win32/gdkmain.c (_gdk_win32_cf_to_string): New debugging diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 82c25cf30d..05e369f8db 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-04-04 Matthias Clasen + + * gtk/gtkactiongroup.c (gtk_action_group_add_action_with_accel): + Use gtk_accel_map_change_entry(), so that reusing the same + action name works. (#170727, Paolo Borelli) + 2005-04-04 Tor Lillqvist * gdk/win32/gdkmain.c (_gdk_win32_cf_to_string): New debugging diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 41f4e25909..198dd2afa7 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -603,7 +603,7 @@ gtk_action_group_add_action_with_accel (GtkActionGroup *action_group, } if (accel_key) - gtk_accel_map_add_entry (accel_path, accel_key, accel_mods); + gtk_accel_map_change_entry (accel_path, accel_key, accel_mods, TRUE); gtk_action_set_accel_path (action, accel_path); gtk_action_group_add_action (action_group, action); -- 2.30.2